271. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-03-13 03:01:09 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

271.1 Files compared

#LocationFileLast Modified
1Porto v4.0.4/Porto Theme/app/design/frontend/Smartwave/porto/web/css/source_sections.less2022-11-03 09:13:05 +0000
2Porto v4.0.5/Porto Theme/app/design/frontend/Smartwave/porto/web/css/source_sections.less2022-11-20 08:22:53 +0000

271.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged7558
Changed00
Inserted13
Removed57

271.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

271.4 Active regular expressions

No regular expressions were active.

271.5 Comparison detail

1 // /** 1 // /**
2 //  * Copyright © 2015 Magento. All rights reserved. 2 //  * Copyright © 2015 Magento. All rights reserved.
3 //  * See COPYING.txt for license details. 3 //  * See COPYING.txt for license details.
4 //  */ 4 //  */
5  5 
6 // 6 //
7 //  Common 7 //  Common
8 //  _____________________________________________ 8 //  _____________________________________________
9  9 
10 & when (@media-common = true) { 10 & when (@media-common = true) {
11   .product.data.items { 11   .product.data.items {
12       .lib-data-accordion(); 12       .lib-data-accordion();
13       .item.title { 13       .item.title {
14           color: #818692; 14           color: #818692;
15           padding: 15px 0; 15           padding: 15px 0;
16           font-weight: 700; 16           font-weight: 700;
17           text-transform: uppercase; 17           text-transform: uppercase;
18           background: none; 18           background: none;
19           border-bottom: 2px solid #e7e7e7; 19           border-bottom: 2px solid #e7e7e7;
20           >.switch { 20           >.switch {
21             font-size: 13px; 21             font-size: 13px;
22             display: inline-block; 22             display: inline-block;
23             border: none; 23             border: none;
24             height: auto; 24             height: auto;
25             padding: 0 !important; 25             padding: 0 !important;
26             color: inherit; 26             color: inherit;
27             font-weight: inherit; 27             font-weight: inherit;
28             line-height: inherit; 28             line-height: inherit;
29             background: none !important; 29             background: none !important;
30             display: block; 30             display: block;
31             &:hover { 31             &:hover {
32               color: inherit; 32               color: inherit;
33               background: none; 33               background: none;
34             } 34             }
35           } 35           }
36           &.active { 36           &.active {
37             color: #222529; 37             color: #222529;
38             border-color: #222529; 38             border-color: #222529;
39             >.switch { 39             >.switch {
40               color: inherit; 40               color: inherit;
41               background: none; 41               background: none;
42               padding: 0; 42               padding: 0;
43               &:hover,&:focus { 43               &:hover,&:focus {
44                 padding: 0; 44                 padding: 0;
45                 color: inherit; 45                 color: inherit;
46                 background: none; 46                 background: none;
47               } 47               }
48             } 48             }
49           } 49           }
50           &:hover { 50           &:hover {
51             border-color: #222529; 51             border-color: #222529;
52             color: #222529; 52             color: #222529;
53             >.switch { 53             >.switch {
54               color: inherit; 54               color: inherit;
55               padding: 0; 55               padding: 0;
56             } 56             }
57           } 57           }
58           a { 58           a {
59               position: relative; 59               position: relative;
60               &:after { 60               &:after {
61                   font-family: 'porto-icons'; 61                   font-family: 'porto-icons';
62                   content: @icon-down; 62                   content: @icon-down;
63                   position: absolute; 63                   position: absolute;
64                   right: @accordion-control__padding-right; 64                   right: @accordion-control__padding-right;
65                   top: @accordion-control__padding-top; 65                   top: @accordion-control__padding-top;
66               } 66               }
67           } 67           }
68           &.active a:after { 68           &.active a:after {
69               content: @icon-up; 69               content: @icon-up;
70               font-family: 'porto-icons'; 70               font-family: 'porto-icons';
71           } 71           }
72       } 72       }
73       > .item { 73       > .item {
74           &.content { 74           &.content {
75             border: none; 75             border: none;
76             box-shadow: none; 76             box-shadow: none;
77             padding: 30px 0 15px; 77             padding: 30px 0 15px;
78             background: none;    
79             p { 78             p {
80               font-size: 14px; 79               font-size: 14px;
81               font-weight: 400; 80               font-weight: 400;
82               letter-spacing: .005em; 81               letter-spacing: .005em;
83               line-height: 1.9; 82               line-height: 1.9;
84             } 83             }
85           } 84           }
86       } 85       }
87       .value p:last-child { 86       .value p:last-child {
88           margin-bottom: 0; 87           margin-bottom: 0;
89       } 88       }
90       .table-wrapper { 89       .table-wrapper {
91           margin: 0; 90           margin: 0;
92       } 91       }
93   } 92   }
94   .porto-info-list,.product.description ul { 93   .porto-info-list,.product.description ul {
95     padding-left: 38.5px; 94     padding-left: 38.5px;
96     margin-bottom: 20px; 95     margin-bottom: 20px;
97     li { 96     li {
98         list-style: none; 97         list-style: none;
99         line-height: 1.5; 98         line-height: 1.5;
100         padding-top: .5em; 99         padding-top: .5em;
101         padding-bottom: .5em; 100         padding-bottom: .5em;
102         margin: 0; 101         margin: 0;
103         display: -ms-flexbox; 102         display: -ms-flexbox;
104         display: flex; 103         display: flex;
105         -ms-flex-align: center; 104         -ms-flex-align: center;
106         align-items: center; 105         align-items: center;
107     } 106     }
108     .porto-info-icon, [class^=porto-icon-] { 107     .porto-info-icon, [class^=porto-icon-] {
109         margin-right: 16.5px; 108         margin-right: 16.5px;
110         line-height: 1.3; 109         line-height: 1.3;
111         position: relative;    
112         top: 2px; 110         top: 2px;
113         color: #21293c; 111         color: #21293c;
114         font-size: 16px; 112         font-size: 16px;
115     } 113     }
116     .porto-icon-ok:before { 114     .porto-icon-ok:before {
117       content: '\e8c1'; 115       content: '\e8c1';
118     } 116     }
119     .porto-info-list-item .porto-info-icon { 117     .porto-info-list-item .porto-info-icon {
120         width: auto; 118         width: auto;
121         display: inline-block; 119         display: inline-block;
122     } 120     }
123   } 121   }
124 } 122 }
125  123 
126 // 124 //
127 //  Desktop 125 //  Desktop
128 //  _____________________________________________ 126 //  _____________________________________________
129  127 
130 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { 128 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
131     .product.data.items { 129     .product.data.items {
132         .lib-data-tabs(); 130         .lib-data-tabs();
133         border-bottom: 0; 131         border-bottom: 0;
134         margin-left: 0; 132         margin-left: 0;
135         margin-right: 0; 133         margin-right: 0;
136         .item.title a:after { 134         .item.title a:after {
137             display: none; 135             display: none;
138         } 136         }
139         > .item { 137         > .item {
    138             &:first-child + div.item.content {
    139               display: block;
    140             }
140             &.title { 141             &.title {
141                 margin: 0 35px 0 0; 142                 margin: 0 35px 0 0;
142                 color: #818692; 143                 color: #818692;
143                 padding: 7px 0; 144                 padding: 7px 0;
144                 font-weight: 700; 145                 font-weight: 700;
145                 text-transform: uppercase; 146                 text-transform: uppercase;
146                 background: none; 147                 background: none;
147                 border-bottom: 2px solid transparent; 148                 border-bottom: 2px solid transparent;
148                 >.switch { 149                 >.switch {
149                   font-size: 13px; 150                   font-size: 13px;
150                   display: inline-block; 151                   display: inline-block;
151                   border: none; 152                   border: none;
152                   height: auto; 153                   height: auto;
153                   padding: 0 !important; 154                   padding: 0 !important;
154                   color: inherit; 155                   color: inherit;
155                   font-weight: inherit; 156                   font-weight: inherit;
156                   line-height: inherit; 157                   line-height: inherit;
157                   background: none !important; 158                   background: none !important;
158                   display: block; 159                   display: block;
159                   &:hover,&:active,&:focus { 160                   &:hover,&:active,&:focus {
160                     color: inherit !important; 161                     color: inherit !important;
161                     border-color: inherit  !important; 162                     border-color: inherit  !important;
162                     background: none; 163                     background: none;
163                   } 164                   }
164                 } 165                 }
165                 &.active { 166                 &.active {
166                   color: #222529; 167                   color: #222529;
167                   border-color: #222529; 168                   border-color: #222529;
168                   >.switch { 169                   >.switch {
169                     color: inherit; 170                     color: inherit;
170                     background: none; 171                     background: none;
171                     padding: 0; 172                     padding: 0;
172                     &:hover,&:focus { 173                     &:hover,&:focus {
173                       padding: 0; 174                       padding: 0;
174                       color: inherit; 175                       color: inherit;
175                       background: none; 176                       background: none;
176                     } 177                     }
177                   } 178                   }
178                 } 179                 }
179                 &:hover { 180                 &:hover {
180                   border-color: #222529; 181                   border-color: #222529;
181                   >.switch { 182                   >.switch {
182                     color: inherit; 183                     color: inherit;
183                     padding: 0; 184                     padding: 0;
184                   } 185                   }
185                 } 186                 }
186             } 187             }
187             &.content { 188             &.content {
188               border: none; 189               border: none;
189               border-top: solid 1px #e7e7e7; 190               border-top: solid 1px #e7e7e7;
190               box-shadow: none; 191               box-shadow: none;
191               padding: 30px 0 15px; 192               padding: 30px 0 15px;
192               margin-top: 40px; 193               margin-top: 40px;
193               background: none;    
194             } 194             }
195         } 195         }
196         .vertical & { 196         .vertical & {
197           > .item { 197           > .item {
198             &:first-child + div.item.content {    
199               display: block;    
200             }    
201             &.title { 198             &.title {
202               max-width: 20%; 199               max-width: 20%;
203               text-align: left; 200               text-align: left;
204               float: none; 201               float: none;
205               border: none; 202               border: none;
206               padding: 0; 203               padding: 0;
207               margin: 0; 204               margin: 0;
208               margin-bottom: 13px; 205               margin-bottom: 13px;
209               overflow: hidden; 206               overflow: hidden;
210               position: relative; 207               position: relative;
211               >.switch { 208               >.switch {
212                 padding: 3px 0 10px !important; 209                 padding: 3px 0 10px !important;
213                 display: inline-block; 210                 display: inline-block;
214                 &::before { 211                 &::before {
215                   content: ''; 212                   content: '';
216                   position: absolute; 213                   position: absolute;
217                   width: 100%; 214                   width: 100%;
218                   bottom: 0; 215                   bottom: 0;
219                   border-bottom: 1px solid #dae2e6; 216                   border-bottom: 1px solid #dae2e6;
220                   z-index: 1; 217                   z-index: 1;
221                 } 218                 }
222                 &::after { 219                 &::after {
223                   content: ''; 220                   content: '';
224                   display: block; 221                   display: block;
225                   position: absolute; 222                   position: absolute;
226                   width: 30vw; 223                   width: 30vw;
227                   bottom: 0; 224                   bottom: 0;
228                   border-bottom: 1px solid #dae2e6; 225                   border-bottom: 1px solid #dae2e6;
229                   z-index: 0; 226                   z-index: 0;
230                   left: 0; 227                   left: 0;
231                 } 228                 }
232               } 229               }
233               &.active,&:hover { 230               &.active,&:hover {
234                 >.switch { 231                 >.switch {
235                   &::before { 232                   &::before {
236                     border-width: 2px; 233                     border-width: 2px;
237                     border-bottom-color: inherit; 234                     border-bottom-color: inherit;
238                   } 235                   }
239                 } 236                 }
240               } 237               }
241             } 238             }
242             &.content { 239             &.content {
243               position: absolute; 240               position: absolute;
244               float: none; 241               float: none;
245               margin: 0; 242               margin: 0;
246               width: 80%; 243               width: 80%;
247               right: 0; 244               right: 0;
248               top: 0; 245               top: 0;
249               padding-top: 0; 246               padding-top: 0;
250               border-top: none; 247               border-top: none;
251               padding-left: 30px; 248               padding-left: 30px;
252               min-height: 180px; 249               min-height: 180px;
253               display: none;    
254             } 250             }
255           } 251           }
256         } 252         }
257         .accordion & { 253         .accordion & {
258           & > .item.title { 254           & > .item.title {
259             border-color: #e7e7e7; 255             border-color: #e7e7e7;
260             &.active { 256             &.active {
261               border-color: inherit; 257               border-color: inherit;
262             } 258             }
263           } 259           }
264           & > .item.title, & > .item.content { 260           & > .item.title, & > .item.content {
265               float: none; 261               float: none;
266               margin: 0; 262               margin: 0;
267               display: block; 263               display: block;
268           } 264           }
269           & > .item.content { 265           & > .item.content {
270             border: none; 266             border: none;
271           } 267           }
272         } 268         }
273         .sticky & { 269         .sticky & {
274           & > .item.title { 270           & > .item.title {
275             &.active { 271             &.active {
276               color: inherit; 272               color: inherit;
277               border-color: transparent; 273               border-color: transparent;
278             } 274             }
279             &:hover { 275             &:hover {
280               color: inherit; 276               color: inherit;
281               border-color: inherit; 277               border-color: inherit;
282             } 278             }
283           } 279           }
284         } 280         }
285     } 281     }
286 } 282 }